auto merge of #246 : alexcrichton/cargo/issue-227, r=wycats

author bors <bors@rust-lang.org>

Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)

committer bors <bors@rust-lang.org>

Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
author bors <bors@rust-lang.org>
Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
committer bors <bors@rust-lang.org>
Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge
diff --cc tests/test_cargo_compile.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 23 Jul 2014 15:29:36 +0000 (15:29 +0000)
		1	2
src/cargo/ops/cargo_rustc/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_compile.rs	patch \|	diff1 \|	diff2 \|	blob \| history